Autogenerated HTML docs for v1.5.3-rc6-9-gaabb2
diff --git a/config.txt b/config.txt index 46f40ad..462595c 100644 --- a/config.txt +++ b/config.txt
@@ -675,15 +675,11 @@ See gitlink:git-show-branch[1]. tar.umask:: - By default, gitlink:git-tar-tree[1] sets file and directories modes - to 0666 or 0777. While this is both useful and acceptable for projects - such as the Linux Kernel, it might be excessive for other projects. - With this variable, it becomes possible to tell - gitlink:git-tar-tree[1] to apply a specific umask to the modes above. - The special value "user" indicates that the user's current umask will - be used. This should be enough for most projects, as it will lead to - the same permissions as gitlink:git-checkout[1] would use. The default - value remains 0, which means world read-write. + This variable can be used to restrict the permission bits of + tar archive entries. The default is 0002, which turns off the + world write bit. The special value "user" indicates that the + archiving user's umask will be used instead. See umask(2) and + gitlink:git-archive[1]. user.email:: Your email address to be recorded in any newly created commits.
diff --git a/git-archive.html b/git-archive.html index f93361a..402de7c 100644 --- a/git-archive.html +++ b/git-archive.html
@@ -388,16 +388,20 @@ </div> <h2>CONFIGURATION</h2> <div class="sectionbody"> -<p>By default, file and directories modes are set to 0666 or 0777 in tar -archives. It is possible to change this by setting the "umask" variable -in the repository configuration as follows :</p> -<div class="literalblock"> -<div class="content"> -<pre><tt>umask = 002 ;# group friendly</tt></pre> -</div></div> -<p>The special umask value "user" indicates that the user's current umask -will be used instead. The default value remains 0, which means world -readable/writable files and directories.</p> +<dl> +<dt> +tar.umask +</dt> +<dd> +<p> + This variable can be used to restrict the permission bits of + tar archive entries. The default is 0002, which turns off the + world write bit. The special value "user" indicates that the + archiving user's umask will be used instead. See umask(2) for + details. +</p> +</dd> +</dl> </div> <h2>EXAMPLES</h2> <div class="sectionbody"> @@ -454,7 +458,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 19-Jul-2007 02:09:31 UTC +Last updated 23-Aug-2007 00:24:02 UTC </div> </div> </body>
diff --git a/git-archive.txt b/git-archive.txt index 4da07c1..f2080eb 100644 --- a/git-archive.txt +++ b/git-archive.txt
@@ -72,16 +72,13 @@ CONFIGURATION ------------- -By default, file and directories modes are set to 0666 or 0777 in tar -archives. It is possible to change this by setting the "umask" variable -in the repository configuration as follows : -[tar] - umask = 002 ;# group friendly - -The special umask value "user" indicates that the user's current umask -will be used instead. The default value remains 0, which means world -readable/writable files and directories. +tar.umask:: + This variable can be used to restrict the permission bits of + tar archive entries. The default is 0002, which turns off the + world write bit. The special value "user" indicates that the + archiving user's umask will be used instead. See umask(2) for + details. EXAMPLES --------
diff --git a/git-config.html b/git-config.html index 2c95d21..a820b02 100644 --- a/git-config.html +++ b/git-config.html
@@ -1772,15 +1772,11 @@ </dt> <dd> <p> - By default, <a href="git-tar-tree.html">git-tar-tree(1)</a> sets file and directories modes - to 0666 or 0777. While this is both useful and acceptable for projects - such as the Linux Kernel, it might be excessive for other projects. - With this variable, it becomes possible to tell - <a href="git-tar-tree.html">git-tar-tree(1)</a> to apply a specific umask to the modes above. - The special value "user" indicates that the user's current umask will - be used. This should be enough for most projects, as it will lead to - the same permissions as <a href="git-checkout.html">git-checkout(1)</a> would use. The default - value remains 0, which means world read-write. + This variable can be used to restrict the permission bits of + tar archive entries. The default is 0002, which turns off the + world write bit. The special value "user" indicates that the + archiving user's umask will be used instead. See umask(2) and + <a href="git-archive.html">git-archive(1)</a>. </p> </dd> <dt> @@ -1883,7 +1879,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 21-Aug-2007 02:20:17 UTC +Last updated 23-Aug-2007 00:24:02 UTC </div> </div> </body>
diff --git a/git-rev-list.html b/git-rev-list.html index cef5df9..d474c77 100644 --- a/git-rev-list.html +++ b/git-rev-list.html
@@ -679,9 +679,9 @@ taken from the reflog. By default, <em>commit@{Nth}</em> notation is used in the output. When the starting commit is specified as instead. Under <em>--pretty=oneline</em>, the commit message is -prefixed with this information on the same line.<br /> -Cannot be combined with --reverse. +prefixed with this information on the same line. </p> +<p>Cannot be combined with <em>--reverse</em>.</p> </dd> <dt> --merge @@ -782,7 +782,7 @@ <dd> <p> Output the commits in reverse order. - Cannot be combined with --walk-reflogs. + Cannot be combined with <em>--walk-reflogs</em>. </p> </dd> </dl> @@ -1144,7 +1144,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 21-Aug-2007 02:20:19 UTC +Last updated 23-Aug-2007 00:24:04 UTC </div> </div> </body> diff --git a/git-rev-list.txt b/git-rev-list.txt index cbbc234..a0c611e 100644 --- a/git-rev-list.txt +++ b/git-rev-list.txt
@@ -298,8 +298,8 @@ 'commit@{now}', output also uses 'commit@\{timestamp}' notation instead. Under '\--pretty=oneline', the commit message is prefixed with this information on the same line. -+ -Cannot be combined with --reverse. + +Cannot be combined with '\--reverse'. --merge:: @@ -375,7 +375,7 @@ --reverse:: Output the commits in reverse order. - Cannot be combined with --walk-reflogs. + Cannot be combined with '\--walk-reflogs'. Object Traversal ~~~~~~~~~~~~~~~~ diff --git a/git-svn.html b/git-svn.html index 0735891..f40dcc1 100644 --- a/git-svn.html +++ b/git-svn.html
@@ -973,6 +973,33 @@ history of the directory that it is tracking, however (much like how <em>svn log</em> works).</p> </div> +<h2>CAVEATS</h2> +<div class="sectionbody"> +<p>For the sake of simplicity and interoperating with a less-capable system +(SVN), it is recommended that all git-svn users clone, fetch and dcommit +directly from the SVN server, and avoid all git-clone/pull/merge/push +operations between git repositories and branches. The recommended +method of exchanging code between git branches and users is +git-format-patch and git-am, or just dcommiting to the SVN repository.</p> +<p>Running <em>git-merge</em> or <em>git-pull</em> is NOT recommended on a branch you +plan to dcommit from. Subversion does not represent merges in any +reasonable or useful fashion; so users using Subversion cannot see any +merges you've made. Furthermore, if you merge or pull from a git branch +that is a mirror of an SVN branch, dcommit may commit to the wrong +branch.</p> +<p><em>git-clone</em> does not clone branches under the refs/remotes/ hierarchy or +any git-svn metadata, or config. So repositories created and managed with +using git-svn should use rsync(1) for cloning, if cloning is to be done +at all.</p> +<p>Since <em>dcommit</em> uses rebase internally, any git branches you git-push to +before dcommit on will require forcing an overwrite of the existing ref +on the remote repository. This is generally considered bad practice, +see the git-push(1) documentation for details.</p> +<p>Do not use the --amend option of git-commit(1) on a change you've +already dcommitted. It is considered bad practice to --amend commits +you've already pushed to a remote repository for other users, and +dcommit with SVN is analogous to that.</p> +</div> <h2>BUGS</h2> <div class="sectionbody"> <p>We ignore all SVN properties except svn:executable. Any unhandled @@ -1023,7 +1050,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 07-Aug-2007 06:05:54 UTC +Last updated 23-Aug-2007 00:24:06 UTC </div> </div> </body>
diff --git a/git-svn.txt b/git-svn.txt index 816340b..fbc5887 100644 --- a/git-svn.txt +++ b/git-svn.txt
@@ -479,6 +479,38 @@ history of the directory that it is tracking, however (much like how 'svn log' works). +CAVEATS +------- + +For the sake of simplicity and interoperating with a less-capable system +(SVN), it is recommended that all git-svn users clone, fetch and dcommit +directly from the SVN server, and avoid all git-clone/pull/merge/push +operations between git repositories and branches. The recommended +method of exchanging code between git branches and users is +git-format-patch and git-am, or just dcommiting to the SVN repository. + +Running 'git-merge' or 'git-pull' is NOT recommended on a branch you +plan to dcommit from. Subversion does not represent merges in any +reasonable or useful fashion; so users using Subversion cannot see any +merges you've made. Furthermore, if you merge or pull from a git branch +that is a mirror of an SVN branch, dcommit may commit to the wrong +branch. + +'git-clone' does not clone branches under the refs/remotes/ hierarchy or +any git-svn metadata, or config. So repositories created and managed with +using git-svn should use rsync(1) for cloning, if cloning is to be done +at all. + +Since 'dcommit' uses rebase internally, any git branches you git-push to +before dcommit on will require forcing an overwrite of the existing ref +on the remote repository. This is generally considered bad practice, +see the git-push(1) documentation for details. + +Do not use the --amend option of git-commit(1) on a change you've +already dcommitted. It is considered bad practice to --amend commits +you've already pushed to a remote repository for other users, and +dcommit with SVN is analogous to that. + BUGS ----
diff --git a/git-svnimport.html b/git-svnimport.html index 532c064..14f2b94 100644 --- a/git-svnimport.html +++ b/git-svnimport.html
@@ -368,6 +368,14 @@ </p> </dd> <dt> +-u +</dt> +<dd> +<p> + Replace underscores in tag names with periods. +</p> +</dd> +<dt> -I <ignorefile_name> </dt> <dd> @@ -534,7 +542,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 19-Jul-2007 02:09:57 UTC +Last updated 23-Aug-2007 00:24:06 UTC </div> </div> </body>
diff --git a/git-svnimport.txt b/git-svnimport.txt index e97d15e..71aad8b 100644 --- a/git-svnimport.txt +++ b/git-svnimport.txt
@@ -68,6 +68,9 @@ Prepend 'rX: ' to commit messages, where X is the imported subversion revision. +-u:: + Replace underscores in tag names with periods. + -I <ignorefile_name>:: Import the svn:ignore directory property to files with this name in each directory. (The Subversion and GIT ignore
diff --git a/git-tar-tree.html b/git-tar-tree.html index e26799f..b9d0f52 100644 --- a/git-tar-tree.html +++ b/git-tar-tree.html
@@ -321,16 +321,20 @@ </div> <h2>CONFIGURATION</h2> <div class="sectionbody"> -<p>By default, file and directories modes are set to 0666 or 0777. It is -possible to change this by setting the "umask" variable in the -repository configuration as follows :</p> -<div class="literalblock"> -<div class="content"> -<pre><tt>umask = 002 ;# group friendly</tt></pre> -</div></div> -<p>The special umask value "user" indicates that the user's current umask -will be used instead. The default value is 002, which means group -readable/writable files and directories.</p> +<dl> +<dt> +tar.umask +</dt> +<dd> +<p> + This variable can be used to restrict the permission bits of + tar archive entries. The default is 0002, which turns off the + world write bit. The special value "user" indicates that the + archiving user's umask will be used instead. See umask(2) for + details. +</p> +</dd> +</dl> </div> <h2>EXAMPLES</h2> <div class="sectionbody"> @@ -395,7 +399,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 19-Jul-2007 02:09:57 UTC +Last updated 23-Aug-2007 00:24:08 UTC </div> </div> </body>
diff --git a/git-tar-tree.txt b/git-tar-tree.txt index 2d01d96..434607b 100644 --- a/git-tar-tree.txt +++ b/git-tar-tree.txt
@@ -42,16 +42,13 @@ CONFIGURATION ------------- -By default, file and directories modes are set to 0666 or 0777. It is -possible to change this by setting the "umask" variable in the -repository configuration as follows : -[tar] - umask = 002 ;# group friendly - -The special umask value "user" indicates that the user's current umask -will be used instead. The default value is 002, which means group -readable/writable files and directories. +tar.umask:: + This variable can be used to restrict the permission bits of + tar archive entries. The default is 0002, which turns off the + world write bit. The special value "user" indicates that the + archiving user's umask will be used instead. See umask(2) for + details. EXAMPLES --------
